Merge changes made in No Gnus
authorGnus developers <ding@gnus.org>
Sun, 10 Jun 2012 22:16:03 +0000 (22:16 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 10 Jun 2012 22:16:03 +0000 (22:16 +0000)
commit10cf8b0d17f803220254741a74f7e60eb764c45f
tree4e57df234a188388c3bfe3cd126220d671b5289d
parent57414101a020053f20c40d68de22764d0d5fd714
Merge changes made in No Gnus

2012-06-10  Toke Hoiland-Jorgensen <toke@toke.dk> (tiny change)
* nnmaildir.el (nnmaildir-request-expire-articles):
  Ensure that `time' is an integer to avoid later problems.
2012-06-10  Lars Magne Ingebrigtsen <larsi@gnus.org>
* shr.el: Add a iso-8859-1 cookie to make stuff work under other
 locales.
lisp/gnus/ChangeLog
lisp/gnus/nnmaildir.el
lisp/gnus/shr.el